Sync with master again #4326

sentrivana · 2025-04-24T13:55:19Z

Includes porting the decimal fix and feature flag changes. Would appreciate 👀 on this to make sure it makes sense

DON'T MERGE, this is just for review purposes, the merge commit must be pushed directly to potel-base otherwise we'll get the same merge conflicts again

Flags evaluated within a span are appended to the span as attributes. --------- Co-authored-by: Daniel Szoke <[email protected]>

When (at least) one of integrations is enabled (because some dependencies are installed in the environment), `sentry.sdk.name` is changed from `sentry.python` to `sentry.python.[FIRST_ENABLED_INTEGRATION]` which makes `test_logs_attributes` fail. Prevent failure by relaxing the check. This change is beneficial not only for packaging (this patch was required for packaging for Fedora), but also for running tests with `pytest` directly.  --- Thank you for contributing to `sentry-python`! Please add tests to validate your changes, and lint your code using `tox -e linters`. Running the test suite on your PR might require maintainer approval.

Make types that users can use when configuring the SDK public. Accompaniyng docs update: getsentry/sentry-docs#13437 Fixes #4127

…cket (#4293) In [ASGI Specs](https://github.com/django/asgiref/blob/main/specs/www.rst#websocket-connection-scope), `method` is not in Websocket Connection Scope.

Toxgen should only consider the highest patch release of each `major.minor` version. For the most part this was working fine as long as the releases were ordered as expected in PyPI, but in cases where a lower patch version succeeded a higher patch version in the release list from PyPI, we would incorrectly consider the lower patch version as well, instead of ignoring it in favor of the higher patch. Example: - we pull releases `[1.2.3, 1.2.4, 1.2.5, 1.2.2]` from PyPI (in that order) - we consolidate `1.2.3, 1.2.4, 1.2.5` into one version, `1.2.5`, as expected - `1.2.2` will not disappear into `1.2.5` because of a faulty check in toxgen and will instead be considered as a new version - our resulting list of releases eligible for testing will be `[1.2.5, 1.2.2]` instead of just `[1.2.5]`, which then results in picking versions that are not nicely spaced apart

Depends on #4323

Fixes #4213

codecov · 2025-04-24T13:57:05Z

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 84.37%. Comparing base (6d2e988) to head (d7e2c21).
Report is 14 commits behind head on potel-base.

✅ All tests successful. No failed tests found.

Additional details and impacted files

@@              Coverage Diff               @@
##           potel-base    #4326      +/-   ##
==============================================
+ Coverage       84.36%   84.37%   +0.01%     
==============================================
  Files             144      144              
  Lines           14636    14647      +11     
  Branches         2326     2328       +2     
==============================================
+ Hits            12348    12359      +11     
  Misses           1561     1561              
  Partials          727      727

Files with missing lines	Coverage Δ
sentry_sdk/feature_flags.py	`90.62% <100.00%> (+0.96%)`	⬆️
sentry_sdk/integrations/asgi.py	`91.94% <100.00%> (ø)`
sentry_sdk/integrations/launchdarkly.py	`90.32% <100.00%> (-0.31%)`	⬇️
sentry_sdk/integrations/openfeature.py	`80.00% <100.00%> (-1.82%)`	⬇️
sentry_sdk/integrations/unleash.py	`89.47% <100.00%> (-0.53%)`	⬇️
sentry_sdk/opentelemetry/sampler.py	`91.40% <100.00%> (ø)`
sentry_sdk/tracing.py	`80.41% <100.00%> (+0.41%)`	⬆️
sentry_sdk/tracing_utils.py	`84.46% <100.00%> (+0.07%)`	⬆️
sentry_sdk/types.py	`100.00% <100.00%> (ø)`

sl0thentr0py · 2025-04-25T12:09:34Z

sentry_sdk/tracing.py

+        flag_count = self.get_attribute("flag.count") or 0
+        if flag_count < _FLAGS_CAPACITY:
+            self.set_attribute(f"flag.evaluation.{flag}", value)
+            self.set_attribute("flag.count", flag_count + 1)


Do we want to remove this flag.count in the span processor at the end?

We should probably cleanup some of these internal attributes at the end in general, since it costs money to get indexed and stored.

Will do in a new PR!

cmanallen and others added 11 commits April 17, 2025 08:24

feat(spans): Record flag evaluations as span attributes (#4280)

f3687fc

Flags evaluated within a span are appended to the span as attributes. --------- Co-authored-by: Daniel Szoke <[email protected]>

Make all relevant types public (#4315)

d1819c7

Make types that users can use when configuring the SDK public. Accompaniyng docs update: getsentry/sentry-docs#13437 Fixes #4127

fix(integrations): ASGI integration not capture transactions in Webso…

b96e2b6

…cket (#4293) In [ASGI Specs](https://github.com/django/asgiref/blob/main/specs/www.rst#websocket-connection-scope), `method` is not in Websocket Connection Scope.

tests: Move aiohttp under toxgen (#4319)

2c3776c

Depends on #4323

Make sure to use the default decimal context in our code (#4231)

bbb41a3

Fixes #4213

release: 2.27.0

049f2a0

Update CHANGELOG.md

919bdea

Merge branch 'release/2.27.0'

76d6b04

sentrivana changed the title ~~Ivana/potel/sync with master again~~ Sync with master again Apr 24, 2025

sentrivana added the Do not merge label Apr 24, 2025

sentrivana force-pushed the ivana/potel/sync-with-master-again branch 3 times, most recently from 67f56bf to 3fe6c9e Compare April 24, 2025 14:18

Merge branch 'master' into potel-base

d7e2c21

sentrivana force-pushed the ivana/potel/sync-with-master-again branch from 3fe6c9e to d7e2c21 Compare April 24, 2025 14:25

sl0thentr0py approved these changes Apr 25, 2025

View reviewed changes

sl0thentr0py reviewed Apr 25, 2025

View reviewed changes

sentrivana merged commit d7e2c21 into potel-base Apr 28, 2025
129 checks passed

sentrivana deleted the ivana/potel/sync-with-master-again branch April 28, 2025 07:25

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Sync with master again #4326

Sync with master again #4326

Uh oh!

sentrivana commented Apr 24, 2025 •

edited

Loading

Uh oh!

codecov bot commented Apr 24, 2025 •

edited

Loading

Uh oh!

sl0thentr0py Apr 25, 2025

Uh oh!

sentrivana Apr 28, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

Sync with master again #4326

Sync with master again #4326

Uh oh!

Conversation

sentrivana commented Apr 24, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

codecov bot commented Apr 24, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

sl0thentr0py Apr 25, 2025

Choose a reason for hiding this comment

Uh oh!

sentrivana Apr 28, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

sentrivana commented Apr 24, 2025 •

edited

Loading

codecov bot commented Apr 24, 2025 •

edited

Loading